From 626dad6c85f0fc8a40cbabdd2432bb2e2407a099 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Mon, 30 Dec 2013 17:44:30 +0200 Subject: [PATCH] Firtst successful build for version 2.2 --- .gitignore | 2 + CMakeLists.txt | 48 +++++------ debian/changelog | 6 ++ debian/mathgl-doc-en.install | 1 - debian/mathgl-doc-ru.install | 2 - ...keLists-txt.patch => CMakeLists.txt.patch} | 81 +++++++++---------- debian/patches/series | 3 +- debian/patches/src-fft-cpp.patch | 11 --- 8 files changed, 71 insertions(+), 83 deletions(-) create mode 100644 .gitignore rename debian/patches/{CMakeLists-txt.patch => CMakeLists.txt.patch} (53%) delete mode 100644 debian/patches/src-fft-cpp.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0bc7fee --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +CMakeLists.txt.orig +src/fft.cpp.orig \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a06dd3..7d55db8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,42 +60,42 @@ set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory") option(enable-double "Enable double precision in MathGL library" ON) option(enable-simple "Slightly increase drawing speed but disable mglDataA class") -option(enable-mpi "Enable mpi") +option(enable-mpi "Enable mpi" ON) option(enable-opengl "Enable OpenGL support" ON) -option(enable-all-docs "Enable all documentation building") +option(enable-all-docs "Enable all documentation building" OFF) #option(enable-doc "Enable documentation building") -option(enable-all "Enable all core features") -option(enable-all-widgets "Enable all Widgets") -option(enable-all-swig "Enable all SWIG based interfaces") -option(enable-pthread "Enable POSIX threads support" OFF) +option(enable-all "Enable all core features" ON) +option(enable-all-widgets "Enable all Widgets" ON) +option(enable-all-swig "Enable all SWIG based interfaces" ON) +option(enable-pthread "Enable POSIX threads support" ON) option(enable-openmp "Enable POSIX threads support" ON) option(enable-lgpl "Enable only LGPL part of MathGL") option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") #option(enable-ltdl "Enable loading modules support") -CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) -CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) -CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON) +CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" ON "NOT enable-all-docs" ON) +CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" ON "NOT enable-all-docs" ON) +CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" ON "NOT enable-all-docs" ON) CMAKE_DEPENDENT_OPTION(enable-doc-pdf-ru "Enable Russian PDF documentation" OFF "NOT enable-all-docs" ON) -CMAKE_DEPENDENT_OPTION(enable-doc-pdf-en "Enable English PDF documentation" OFF "NOT enable-all-docs" ON) -CMAKE_DEPENDENT_OPTION(enable-doc-prc "Enable PDF samples for HTML docs" OFF "NOT enable-all-docs" ON) +CMAKE_DEPENDENT_OPTION(enable-doc-pdf-en "Enable English PDF documentation" ON "NOT enable-all-docs" ON) +CMAKE_DEPENDENT_OPTION(enable-doc-prc "Enable PDF samples for HTML docs" ON "NOT enable-all-docs" ON) CMAKE_DEPENDENT_OPTION(enable-doc-json "Enable JSON samples for HTML docs" OFF "NOT enable-all-docs" ON) option(enable-texi2html "Use texi2html (obsolete package) instead of texi2any" OFF) CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF) -MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-lgpl" OFF) +MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) diff --git a/debian/changelog b/debian/changelog index 7d4c88b..37c8e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mathgl (2.2-1) UNRELEASED; urgency=medium + + * Imported Upstream version 2.2 + + -- Dimitrios Eftaxiopoulos Sat, 28 Dec 2013 16:29:22 +0200 + mathgl (2.1.3.1-4) unstable; urgency=low * More symbols changes for build on ia64 diff --git a/debian/mathgl-doc-en.install b/debian/mathgl-doc-en.install index 689a78a..17b3c06 100644 --- a/debian/mathgl-doc-en.install +++ b/debian/mathgl-doc-en.install @@ -4,5 +4,4 @@ debian/tmp/usr/share/doc/mathgl/*.pdf debian/tmp/usr/share/doc/mathgl/png/* debian/tmp/usr/share/doc/mathgl/udav/* debian/tmp/usr/share/info/mathgl_en.info* usr/share/info/ -debian/tmp/usr/share/doc/mathgl/mathgl_en/* debian/folder/mathgl-doc-en /usr/share/doc-base/ \ No newline at end of file diff --git a/debian/mathgl-doc-ru.install b/debian/mathgl-doc-ru.install index 6b3c557..4a66b1c 100644 --- a/debian/mathgl-doc-ru.install +++ b/debian/mathgl-doc-ru.install @@ -1,6 +1,4 @@ usr/share/doc/mathgl/mathgl_ru.html/ usr/share/doc/mathgl-doc-ru/ usr/share/doc/mathgl/mgl_ru.html/ usr/share/doc/mathgl-doc-ru/ usr/share/doc/mathgl/png/ usr/share/doc/mathgl-doc-ru/ -usr/share/info/mathgl_ru.info* -usr/share/info/mgl_ru.info* debian/folder/mathgl-doc-ru /usr/share/doc-base/ \ No newline at end of file diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists.txt.patch similarity index 53% rename from debian/patches/CMakeLists-txt.patch rename to debian/patches/CMakeLists.txt.patch index 613951d..f5ea945 100644 --- a/debian/patches/CMakeLists-txt.patch +++ b/debian/patches/CMakeLists.txt.patch @@ -1,36 +1,41 @@ -Enable all available features, widgets and interfaces and fix lintian warnings --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,6 +11,9 @@ - set(MathGL_VERSION_MAJOR 2) - set(MathGL_VERSION_MINOR 1.3) - -+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") -+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") -+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro") - - MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) - IF(${option}_ISSET MATCHES "^${option}_ISSET$") -@@ -59,31 +62,31 @@ +@@ -60,42 +60,42 @@ option(enable-double "Enable double precision in MathGL library" ON) option(enable-simple "Slightly increase drawing speed but disable mglDataA class") -option(enable-mpi "Enable mpi") --option(enable-doc "Enable documentation building") ++option(enable-mpi "Enable mpi" ON) + option(enable-opengl "Enable OpenGL support" ON) +-option(enable-all-docs "Enable all documentation building") ++option(enable-all-docs "Enable all documentation building" OFF) + #option(enable-doc "Enable documentation building") -option(enable-all "Enable all core features") -option(enable-all-widgets "Enable all Widgets") -option(enable-all-swig "Enable all SWIG based interfaces") -+option(enable-mpi "Enable mpi" ON) -+option(enable-doc "Enable documentation building" ON) +-option(enable-pthread "Enable POSIX threads support" OFF) +option(enable-all "Enable all core features" ON) +option(enable-all-widgets "Enable all Widgets" ON) +option(enable-all-swig "Enable all SWIG based interfaces" ON) - option(enable-pthread "Enable POSIX threads support" ON) --option(enable-lgpl "Enable only LGPL part of MathGL") --option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") -+option(enable-lgpl "Enable only LGPL part of MathGL" OFF) -+option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'" OFF) ++option(enable-pthread "Enable POSIX threads support" ON) + option(enable-openmp "Enable POSIX threads support" ON) + option(enable-lgpl "Enable only LGPL part of MathGL") + option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") #option(enable-ltdl "Enable loading modules support") +-CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) +-CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) +-CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON) ++CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" ON "NOT enable-all-docs" ON) ++CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" ON "NOT enable-all-docs" ON) ++CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" ON "NOT enable-all-docs" ON) + CMAKE_DEPENDENT_OPTION(enable-doc-pdf-ru "Enable Russian PDF documentation" OFF "NOT enable-all-docs" ON) +-CMAKE_DEPENDENT_OPTION(enable-doc-pdf-en "Enable English PDF documentation" OFF "NOT enable-all-docs" ON) +-CMAKE_DEPENDENT_OPTION(enable-doc-prc "Enable PDF samples for HTML docs" OFF "NOT enable-all-docs" ON) ++CMAKE_DEPENDENT_OPTION(enable-doc-pdf-en "Enable English PDF documentation" ON "NOT enable-all-docs" ON) ++CMAKE_DEPENDENT_OPTION(enable-doc-prc "Enable PDF samples for HTML docs" ON "NOT enable-all-docs" ON) + CMAKE_DEPENDENT_OPTION(enable-doc-json "Enable JSON samples for HTML docs" OFF "NOT enable-all-docs" ON) + option(enable-texi2html "Use texi2html (obsolete package) instead of texi2any" OFF) + CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) @@ -39,36 +44,26 @@ Enable all available features, widgets and interfaces and fix lintian warnings -MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-opengl "Enable OpenGL support" ON "NOT enable-mpi" OFF) --MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON) --MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl;NOT enable-mpi" OFF) --MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON) +-MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +-MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +-CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF) +-MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +-MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) --MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-opengl "Enable OpenGL support" ON "NOT enable-mpi" ON) -+MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-lgpl;NOT enable-mpi" OFF "NOT enable-all-widgets" OFF) -+MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-lgpl;NOT enable-mpi" OFF "NOT enable-all-widgets" OFF) -+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-lgpl;NOT enable-mpi" ON) -+MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" ON "NOT enable-lgpl;NOT enable-mpi" OFF "NOT enable-all-widgets" OFF) -+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" OFF) -+MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" OFF) -+MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" OFF) ++MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-lgpl" OFF) ++MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) ++MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) ++MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) + MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) - set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2") -@@ -402,6 +405,7 @@ - - if(UNIX) - add_definitions(-DNO_COLOR_ARRAY) -+ add_definitions(-D_FORTIFY_SOURCE=2) - endif(UNIX) - - if(WIN32) diff --git a/debian/patches/series b/debian/patches/series index 116b8c9..a160cc9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -src-fft-cpp.patch -CMakeLists-txt.patch +CMakeLists.txt.patch diff --git a/debian/patches/src-fft-cpp.patch b/debian/patches/src-fft-cpp.patch deleted file mode 100644 index bd7184f..0000000 --- a/debian/patches/src-fft-cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/fft.cpp -+++ b/src/fft.cpp -@@ -82,7 +82,7 @@ - void MGL_EXPORT mgl_fft(double *x, long s, long n, const void *wt, void *ws, bool inv) - { - #if MGL_HAVE_GSL --gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?backward:forward); -+gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?gsl_fft_backward:gsl_fft_forward); - #else // NOTE this is VERY slow! - const double *c = (const double *)wt; - double *d = (double *)ws, f = inv?1./n:1; -- 2.30.2